From af0496dc68a01eb578dc3a0e5922ae4d19e5fec7 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 18 Jun 2014 13:25:02 +0200
Subject: [PATCH] themes: use .popover class instead of GtkPopover

https://bugzilla.gnome.org/show_bug.cgi?id=731834
---
 gtk/resources/theme/Adwaita/_common.scss      |  4 +-
 .../theme/Adwaita/gtk-contained-dark.css      | 38 +++++++++----------
 gtk/resources/theme/Adwaita/gtk-contained.css | 38 +++++++++----------
 gtk/resources/theme/Raleigh/gtk-default.css   |  5 +--
 gtk/resources/theme/win32/gtk-win32-base.css  |  8 ++--
 5 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 7b0f696c6f..e124f858ad 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -741,7 +741,7 @@ column-header {
  * Popovers   *
  ***************/
 
-GtkPopover {
+.popover {
   margin: 10px;
   padding: 2px;
   border-color: $borders-color;
@@ -1241,7 +1241,7 @@ $asset_suffix: if($variant=='dark', '-dark', '');
   }
 
   //popover
-  GtkPopover .button.#{$w} {
+  .popover .button.#{$w} {
     &:hover {
       color: transparentize($fg_color,0.9);
       &:active {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 59fcf01716..b12301e7fb 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -920,7 +920,7 @@ column-header .button, column-header .button:hover, column-header .button:active
 /***************
  * Popovers   *
  ***************/
-GtkPopover {
+.popover {
   margin: 10px;
   padding: 2px;
   border-color: #1c1f1f;
@@ -929,11 +929,11 @@ GtkPopover {
   border-radius: 5px;
   background-color: #393f3f;
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
-  GtkPopover:backdrop {
+  .popover:backdrop {
     box-shadow: none; }
-  GtkPopover > .list, GtkPopover > .view, GtkPopover > .toolbar {
+  .popover > .list, .popover > .view, .popover > .toolbar {
     background-color: transparent; }
-  GtkPopover .separator {
+  .popover .separator {
     font-size: 80%;
     font-weight: bold;
     color: #5d6261;
@@ -941,16 +941,16 @@ GtkPopover {
     background-color: transparent;
     icon-shadow: none;
     border: 0; }
-  GtkPopover .button,
-  GtkPopover .button:hover {
+  .popover .button,
+  .popover .button:hover {
     text-shadow: none;
     transition: none; }
-  GtkPopover.osd {
+  .popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
     border: 1px solid #1c1f1f;
     color: white; }
-    GtkPopover.osd .button {
+    .popover.osd .button {
       color: white;
       text-shadow: none;
       border-width: 1px;
@@ -958,19 +958,19 @@ GtkPopover {
       background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.05), rgba(0, 0, 0, 0.01));
       border-color: rgba(255, 255, 255, 0.2);
       box-shadow: none; }
-      GtkPopover.osd .button:hover {
+      .popover.osd .button:hover {
         border-width: 1px;
         border-style: solid;
         background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.01));
         border-color: rgba(255, 255, 255, 0.2);
         box-shadow: none; }
-      GtkPopover.osd .button:active {
+      .popover.osd .button:active {
         border-width: 1px;
         border-style: solid;
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.1));
         border-color: rgba(255, 255, 255, 0.2);
         box-shadow: none; }
-      GtkPopover.osd .button:insensitive {
+      .popover.osd .button:insensitive {
         border-width: 1px;
         border-style: solid;
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.8));
@@ -1487,13 +1487,13 @@ GtkIconView.content-view.cell.check {
     GtkIconView.content-view.cell.check:selected:backdrop {
       color: rgba(201, 203, 201, 0.1); }
 
-GtkPopover .button.check:hover {
+.popover .button.check:hover {
   color: rgba(238, 238, 236, 0.1); }
-  GtkPopover .button.check:hover:active {
+  .popover .button.check:hover:active {
     color: #eeeeec; }
-    GtkPopover .button.check:hover:active:selected {
+    .popover .button.check:hover:active:selected {
       color: white; }
-    GtkPopover .button.check:hover:active:backdrop {
+    .popover .button.check:hover:active:backdrop {
       color: #c9cbc9; }
 
 .radio {
@@ -1644,13 +1644,13 @@ GtkIconView.content-view.cell.radio {
     GtkIconView.content-view.cell.radio:selected:backdrop {
       color: rgba(201, 203, 201, 0.1); }
 
-GtkPopover .button.radio:hover {
+.popover .button.radio:hover {
   color: rgba(238, 238, 236, 0.1); }
-  GtkPopover .button.radio:hover:active {
+  .popover .button.radio:hover:active {
     color: #eeeeec; }
-    GtkPopover .button.radio:hover:active:selected {
+    .popover .button.radio:hover:active:selected {
       color: white; }
-    GtkPopover .button.radio:hover:active:backdrop {
+    .popover .button.radio:hover:active:backdrop {
       color: #c9cbc9; }
 
 GtkCheckButton.text-button, GtkRadioButton.text-button {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index e75f7b98ee..5ad9a37a82 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -920,7 +920,7 @@ column-header .button, column-header .button:hover, column-header .button:active
 /***************
  * Popovers   *
  ***************/
-GtkPopover {
+.popover {
   margin: 10px;
   padding: 2px;
   border-color: #a1a1a1;
@@ -929,11 +929,11 @@ GtkPopover {
   border-radius: 5px;
   background-color: #ededed;
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
-  GtkPopover:backdrop {
+  .popover:backdrop {
     box-shadow: none; }
-  GtkPopover > .list, GtkPopover > .view, GtkPopover > .toolbar {
+  .popover > .list, .popover > .view, .popover > .toolbar {
     background-color: transparent; }
-  GtkPopover .separator {
+  .popover .separator {
     font-size: 80%;
     font-weight: bold;
     color: #c6c8c8;
@@ -941,16 +941,16 @@ GtkPopover {
     background-color: transparent;
     icon-shadow: none;
     border: 0; }
-  GtkPopover .button,
-  GtkPopover .button:hover {
+  .popover .button,
+  .popover .button:hover {
     text-shadow: none;
     transition: none; }
-  GtkPopover.osd {
+  .popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
     border: 1px solid #a1a1a1;
     color: white; }
-    GtkPopover.osd .button {
+    .popover.osd .button {
       color: white;
       text-shadow: none;
       border-width: 1px;
@@ -958,19 +958,19 @@ GtkPopover {
       background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.05), rgba(0, 0, 0, 0.01));
       border-color: rgba(255, 255, 255, 0.2);
       box-shadow: none; }
-      GtkPopover.osd .button:hover {
+      .popover.osd .button:hover {
         border-width: 1px;
         border-style: solid;
         background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.01));
         border-color: rgba(255, 255, 255, 0.2);
         box-shadow: none; }
-      GtkPopover.osd .button:active {
+      .popover.osd .button:active {
         border-width: 1px;
         border-style: solid;
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.1));
         border-color: rgba(255, 255, 255, 0.2);
         box-shadow: none; }
-      GtkPopover.osd .button:insensitive {
+      .popover.osd .button:insensitive {
         border-width: 1px;
         border-style: solid;
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.8));
@@ -1486,13 +1486,13 @@ GtkIconView.content-view.cell.check {
     GtkIconView.content-view.cell.check:selected:backdrop {
       color: rgba(84, 89, 90, 0.1); }
 
-GtkPopover .button.check:hover {
+.popover .button.check:hover {
   color: rgba(46, 52, 54, 0.1); }
-  GtkPopover .button.check:hover:active {
+  .popover .button.check:hover:active {
     color: #2e3436; }
-    GtkPopover .button.check:hover:active:selected {
+    .popover .button.check:hover:active:selected {
       color: white; }
-    GtkPopover .button.check:hover:active:backdrop {
+    .popover .button.check:hover:active:backdrop {
       color: #54595a; }
 
 .radio {
@@ -1643,13 +1643,13 @@ GtkIconView.content-view.cell.radio {
     GtkIconView.content-view.cell.radio:selected:backdrop {
       color: rgba(84, 89, 90, 0.1); }
 
-GtkPopover .button.radio:hover {
+.popover .button.radio:hover {
   color: rgba(46, 52, 54, 0.1); }
-  GtkPopover .button.radio:hover:active {
+  .popover .button.radio:hover:active {
     color: #2e3436; }
-    GtkPopover .button.radio:hover:active:selected {
+    .popover .button.radio:hover:active:selected {
       color: white; }
-    GtkPopover .button.radio:hover:active:backdrop {
+    .popover .button.radio:hover:active:backdrop {
       color: #54595a; }
 
 GtkCheckButton.text-button, GtkRadioButton.text-button {
diff --git a/gtk/resources/theme/Raleigh/gtk-default.css b/gtk/resources/theme/Raleigh/gtk-default.css
index e27ba412a7..24b03358c5 100644
--- a/gtk/resources/theme/Raleigh/gtk-default.css
+++ b/gtk/resources/theme/Raleigh/gtk-default.css
@@ -28,12 +28,11 @@
   -GtkWindow-decoration-button-layout: 'icon:minimize,maximize,close';
 }
 
-GtkWindow, .button, .slider {
+.background, .button, .slider {
   background-color: @bg_color;
 }
 
-GtkPopover {
-  background-color: @bg_color;
+.popover {
   border-color: darker(@bg_color);
   border-width: 1px;
   border-style: solid;
diff --git a/gtk/resources/theme/win32/gtk-win32-base.css b/gtk/resources/theme/win32/gtk-win32-base.css
index a7e2ca692f..cac37877f1 100644
--- a/gtk/resources/theme/win32/gtk-win32-base.css
+++ b/gtk/resources/theme/win32/gtk-win32-base.css
@@ -1356,7 +1356,7 @@ GtkStatusbar > GtkFrame {
 }
 
 /* Popovers */
-GtkPopover {
+.popover {
     border-radius: 3px;
     background-clip: border-box;
     background-color: @bg_color;
@@ -1369,9 +1369,9 @@ GtkPopover {
     margin: 10px;
     padding: 2px;
 }
-GtkPopover > .list,
-GtkPopover > .view,
-GtkPopover > .toolbar {
+.popover > .list,
+.popover > .view,
+.popover > .toolbar {
     background-color: transparent;
 }
 
-- 
2.30.2